feat: use containerd gc for image-fetcher cleanup#8065
Open
awesomenix wants to merge 1 commit intomainfrom
Open
feat: use containerd gc for image-fetcher cleanup#8065awesomenix wants to merge 1 commit intomainfrom
awesomenix wants to merge 1 commit intomainfrom
Conversation
awesomenix
requested review from
AbelHu,
Devinwong,
calvin197,
cameronmeissner,
djsly,
ganeshkumarashok,
juan-lee,
junjiezhang1997,
lilypan26,
mxj220,
pdamianov-dev,
phealy,
r2k1,
sulixu,
surajssd,
timmy-wright and
zachary-bailey
as code owners
awesomenix
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the VHD image preloading flow to rely on containerd’s native GC mechanics (via GC label filtering) rather than scanning images for cleanup, and adds an explicit GC trigger once the preload batch completes.
Changes:
- Add an
--gcmode toimage-fetcherthat triggers containerd GC via lease create/delete. - Update the
image-fetcherpull path to apply containerd GC child-label filtering for layer blobs. - Invoke
image-fetcher --gconce after all parallel image pulls complete during VHD build.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
vhdbuilder/packer/install-dependencies.sh |
Runs a single post-batch image-fetcher --gc after the image preload jobs finish. |
image-fetcher/main.go |
Adds --gc entrypoint and applies WithChildLabelMap(images.ChildGCLabelsFilterLayers) for the pull/unpack path. |
| @@ -699,6 +699,7 @@ while IFS= read -r imageToBePulled; do | |||
| done <<< "$ContainerImages" | |||
| echo "Waiting for container image pulls to finish. PID: ${image_pids[@]}" | |||
| wait ${image_pids[@]} | |||
There was a problem hiding this comment.
wait ${image_pids[@]} only returns the exit status of the last PID waited for, so failures in earlier background pulls can be missed (and with set -e the script would still proceed to run image-fetcher --gc). Consider iterating over PIDs (or looping wait -n until all jobs finish) and tracking any non-zero exit status so the build fails reliably before triggering GC.
Suggested change
| wait ${image_pids[@]} | |
| overall_status=0 | |
| for pid in "${image_pids[@]}"; do | |
| if ! wait "$pid"; then | |
| status=$? | |
| echo "Container image pull job with PID $pid failed with exit code $status" >&2 | |
| overall_status=$status | |
| fi | |
| done | |
| if [ "$overall_status" -ne 0 ]; then | |
| echo "One or more container image pulls failed; skipping image-fetcher GC and exiting with code $overall_status" >&2 | |
| exit "$overall_status" | |
| fi |
Mark unpacked pulled layers as GC-eligible during VHD image preloading and trigger a single synchronous containerd GC after the preload batch. This avoids scanning all images per pull while preserving fetch-only image blobs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
awesomenix
force-pushed
the
image-fetcher-gc-cleanup
branch
from
632f382 to
87a653f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Validation